projects
/
ostree.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a36c89d
)
ostbuild: Check for the Makefile in the correct directory
author
Colin Walters
<walters@verbum.org>
Sat, 14 Jan 2012 21:54:00 +0000
(16:54 -0500)
committer
Colin Walters
<walters@verbum.org>
Sat, 14 Jan 2012 21:54:00 +0000
(16:54 -0500)
src/ostbuild/pyostbuild/builtin_compile_one.py
patch
|
blob
|
history
diff --git
a/src/ostbuild/pyostbuild/builtin_compile_one.py
b/src/ostbuild/pyostbuild/builtin_compile_one.py
index 87d4bcfb8b4d4ec060b08e7604f3a2fd02b4dbc3..de99d67ca4a7b79b47bbbfc210df9e3d4e7d3f80 100755
(executable)
--- a/
src/ostbuild/pyostbuild/builtin_compile_one.py
+++ b/
src/ostbuild/pyostbuild/builtin_compile_one.py
@@
-161,7
+161,10
@@
class OstbuildCompileOne(builtins.Builtin):
args.extend(self.configargs)
run_sync(args, cwd=builddir)
- makefile_path = os.path.join(builddir, 'Makefile')
+ if use_builddir:
+ makefile_path = os.path.join(builddir, 'Makefile')
+ else:
+ makefile_path = 'Makefile'
if not os.path.exists(makefile_path):
fatal("No Makefile found")